*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f44beab4aa58afbfc2a5254b64d610d2c27f3566..d293718850d10d01a2f25e7290e5622348ee2379 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -49,7 +49,6 @@
 
        * textmodes/ispell.el (ispell): Doc fix.
 
->>>>>>> 1.1667
 2000-12-08  Kenichi Handa  <handa@etl.go.jp>
 
        * international/quail.el (quail-insert-decode-map): Check the